merge emacs-23
authorKenichi Handa <handa@m17n.org>
Fri, 8 Oct 2010 02:23:11 +0000 (11:23 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 8 Oct 2010 02:23:11 +0000 (11:23 +0900)

Trivial merge